From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 11 Jan 2014 19:05:07 +0000 (+0100)
Subject: Remove methods in Article deprecated in 1.18
X-Git-Tag: 1.31.0-rc.0~17222^2~2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=d51b873d231dc9cb6986c0fedfa5078f88a23316;p=lhc%2Fweb%2Fwiklou.git

Remove methods in Article deprecated in 1.18

No uses found in core or Gerrit extensions.

* Article::doRedirect() (deprecated in 1.18)
* Article::doUnwatch() (deprecated in 1.18)
* Article::doWatch() (deprecated in 1.18)
* Article::markpatrolled() (deprecated in 1.18)
* Article::unwatch() (deprecated in 1.18)
* Article::watch() (deprecated in 1.18)

Change-Id: I37772ee08baa1d3ee15247b1c869de1299e146a6
---

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index fd76c82923..6e245bfc54 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -208,7 +208,13 @@ changes to languages because of Bugzilla reports.
 * ApiBase::getValidNamespaces() (deprecated in 1.17)
 * ApiMain::setCachePrivate() (deprecated in 1.17)
 * ApiMain::setVaryCookie (deprecated in 1.17)
+* Article::doRedirect() (deprecated in 1.18)
+* Article::doUnwatch() (deprecated in 1.18)
+* Article::doWatch() (deprecated in 1.18)
 * Article::forUpdate() (deprecated in 1.18)
+* Article::markpatrolled() (deprecated in 1.18)
+* Article::unwatch() (deprecated in 1.18)
+* Article::watch() (deprecated in 1.18)
 * CategoryViewer::addSubcategory() (deprecated in 1.17)
 * EditPage::spamPage() (deprecated since 1.17)
 * Exif::getFormattedData() (deprecated in 1.18)
diff --git a/includes/Article.php b/includes/Article.php
index dc4198f739..a8cdc48ecd 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1890,15 +1890,6 @@ class Article implements Page {
 		Action::factory( 'info', $this )->show();
 	}
 
-	/**
-	 * Mark this particular edit/page as patrolled
-	 * @deprecated since 1.18
-	 */
-	public function markpatrolled() {
-		wfDeprecated( __METHOD__, '1.18' );
-		Action::factory( 'markpatrolled', $this )->show();
-	}
-
 	/**
 	 * Handle action=purge
 	 * @deprecated since 1.19
@@ -1926,72 +1917,6 @@ class Article implements Page {
 		Action::factory( 'rollback', $this )->show();
 	}
 
-	/**
-	 * User-interface handler for the "watch" action.
-	 * Requires Request to pass a token as of 1.18.
-	 * @deprecated since 1.18
-	 */
-	public function watch() {
-		wfDeprecated( __METHOD__, '1.18' );
-		Action::factory( 'watch', $this )->show();
-	}
-
-	/**
-	 * Add this page to the current user's watchlist
-	 *
-	 * This is safe to be called multiple times
-	 *
-	 * @return bool true on successful watch operation
-	 * @deprecated since 1.18
-	 */
-	public function doWatch() {
-		wfDeprecated( __METHOD__, '1.18' );
-		return WatchAction::doWatch( $this->getTitle(), $this->getContext()->getUser() );
-	}
-
-	/**
-	 * User interface handler for the "unwatch" action.
-	 * Requires Request to pass a token as of 1.18.
-	 * @deprecated since 1.18
-	 */
-	public function unwatch() {
-		wfDeprecated( __METHOD__, '1.18' );
-		Action::factory( 'unwatch', $this )->show();
-	}
-
-	/**
-	 * Stop watching a page
-	 * @return bool true on successful unwatch
-	 * @deprecated since 1.18
-	 */
-	public function doUnwatch() {
-		wfDeprecated( __METHOD__, '1.18' );
-		return WatchAction::doUnwatch( $this->getTitle(), $this->getContext()->getUser() );
-	}
-
-	/**
-	 * Output a redirect back to the article.
-	 * This is typically used after an edit.
-	 *
-	 * @deprecated in 1.18; call OutputPage::redirect() directly
-	 * @param $noRedir Boolean: add redirect=no
-	 * @param string $sectionAnchor section to redirect to, including "#"
-	 * @param string $extraQuery extra query params
-	 */
-	public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
-		wfDeprecated( __METHOD__, '1.18' );
-		if ( $noRedir ) {
-			$query = 'redirect=no';
-			if ( $extraQuery ) {
-				$query .= "&$extraQuery";
-			}
-		} else {
-			$query = $extraQuery;
-		}
-
-		$this->getContext()->getOutput()->redirect( $this->getTitle()->getFullURL( $query ) . $sectionAnchor );
-	}
-
 	/**
 	 * Use PHP's magic __get handler to handle accessing of
 	 * raw WikiPage fields for backwards compatibility.